From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 3 Jul 2011 05:25:35 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3045^2~11
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=367701e7ccef4d253701555072bdc37e7f01b172;p=emacs.git

Merge from trunk.
---

367701e7ccef4d253701555072bdc37e7f01b172